From 13e5e837985b9154873c82408ef77a8e20dfa30e Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 16 Feb 2016 18:33:16 -0500
Subject: [PATCH] Add message contexts to translated strings

The string "None" is used in multiple contexts; add message contexts
to give translators a chance to translate them accordingly.

https://bugzilla.gnome.org/show_bug.cgi?id=762165
---
 gtk/gtkfontbutton.c         | 2 +-
 gtk/inspector/general.c     | 4 ++--
 gtk/inspector/gestures.c    | 8 ++++----
 gtk/inspector/prop-editor.c | 2 +-
 gtk/inspector/size-groups.c | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index f067bfb829..91a0f98f46 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -1221,7 +1221,7 @@ gtk_font_button_update_font_info (GtkFontButton *font_button)
   if (priv->font_family)
     fam_name = pango_font_family_get_name (priv->font_family);
   else
-    fam_name = _("None");
+    fam_name = C_("font", "None");
   if (priv->font_face)
     face_name = pango_font_face_get_face_name (priv->font_face);
   else
diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
index eae88c7c20..a260becfb5 100644
--- a/gtk/inspector/general.c
+++ b/gtk/inspector/general.c
@@ -222,8 +222,8 @@ init_gl (GtkInspectorGeneral *gen)
   else
 #endif
     {
-      gtk_label_set_text (GTK_LABEL (gen->priv->gl_version), _("None"));
-      gtk_label_set_text (GTK_LABEL (gen->priv->gl_vendor), _("None"));
+      gtk_label_set_text (GTK_LABEL (gen->priv->gl_version), C_("GL version", "None"));
+      gtk_label_set_text (GTK_LABEL (gen->priv->gl_vendor), C_("GL vendor", "None"));
     }
 }
 
diff --git a/gtk/inspector/gestures.c b/gtk/inspector/gestures.c
index b6e87d9f0b..5c5ca75348 100644
--- a/gtk/inspector/gestures.c
+++ b/gtk/inspector/gestures.c
@@ -125,10 +125,10 @@ add_gesture (GtkInspectorGestures *sl,
   gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
 
   combo = gtk_combo_box_text_new ();
-  gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_NONE, _("None"));
-  gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_CAPTURE, _("Capture"));
-  gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_BUBBLE, _("Bubble"));
-  gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_TARGET, _("Target"));
+  gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_NONE, C_("event phase", "None"));
+  gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_CAPTURE, C_("event phase", "Capture"));
+  gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_BUBBLE, C_("event phase", "Bubble"));
+  gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_TARGET, C_("event phase", "Target"));
   gtk_combo_box_set_active (GTK_COMBO_BOX (combo), phase);
   gtk_container_add (GTK_CONTAINER (box), combo);
   gtk_widget_show (combo);
diff --git a/gtk/inspector/prop-editor.c b/gtk/inspector/prop-editor.c
index b014dba5ca..cd855adc22 100644
--- a/gtk/inspector/prop-editor.c
+++ b/gtk/inspector/prop-editor.c
@@ -1282,7 +1282,7 @@ attribute_editor (GObject                *object,
                                   "sensitive", 1,
                                   NULL);
   gtk_list_store_append (store, &iter);
-  gtk_list_store_set (store, &iter, 0, _("None"), 1, TRUE, -1);
+  gtk_list_store_set (store, &iter, 0, C_("property name", "None"), 1, TRUE, -1);
   for (i = 0; i < gtk_tree_model_get_n_columns (model); i++)
     {
       text = g_strdup_printf ("%d", i);
diff --git a/gtk/inspector/size-groups.c b/gtk/inspector/size-groups.c
index 860f398f1d..25a452f338 100644
--- a/gtk/inspector/size-groups.c
+++ b/gtk/inspector/size-groups.c
@@ -249,10 +249,10 @@ add_size_group (GtkInspectorSizeGroups *sl,
   g_object_set (combo, "margin", 10, NULL);
   gtk_widget_set_halign (combo, GTK_ALIGN_END);
   gtk_widget_set_valign (combo, GTK_ALIGN_BASELINE);
-  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("None"));
-  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Horizontal"));
-  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Vertical"));
-  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Both"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), C_("sizegroup mode", "None"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), C_("sizegroup mode", "Horizontal"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), C_("sizegroup mode", "Vertical"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), C_("sizegroup mode", "Both"));
   g_object_bind_property (group, "mode",
                           combo, "active",
                           G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-- 
2.30.2